From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Wed, 9 Jul 2025 17:11:43 +0000 (+0200)
Subject: fix: implicit hydration will not abort synchronization
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1^2~13^2^2~4^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6ce0302486f4d0952880bedf592d190306c198bc;p=nextcloud-desktop.git

fix: implicit hydration will not abort synchronization

should avoid constant sync/abort loop for people having many files

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 41772fa70..b1c94025b 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -1598,19 +1598,19 @@ void Folder::slotWatcherUnreliable(const QString &message)
 
 void Folder::slotHydrationStarts()
 {
-    // Abort any running full sync run and reschedule
-    if (_engine->isSyncRunning()) {
-        setSilenceErrorsUntilNextSync(true);
-        slotTerminateSync();
-        scheduleThisFolderSoon();
-        // TODO: This sets the sync state to AbortRequested on done, we don't want that
-    }
-
-    // Let everyone know we're syncing
-    _syncResult.reset();
-    _syncResult.setStatus(SyncResult::SyncRunning);
-    emit syncStarted();
-    emit syncStateChange();
+    // // Abort any running full sync run and reschedule
+    // if (_engine->isSyncRunning()) {
+    //     setSilenceErrorsUntilNextSync(true);
+    //     slotTerminateSync();
+    //     scheduleThisFolderSoon();
+    //     // TODO: This sets the sync state to AbortRequested on done, we don't want that
+    // }
+
+    // // Let everyone know we're syncing
+    // _syncResult.reset();
+    // _syncResult.setStatus(SyncResult::SyncRunning);
+    // emit syncStarted();
+    // emit syncStateChange();
 }
 
 void Folder::slotHydrationDone()